Quote LMX url output. Minor doc and leadk fixes.

diff --git a/lmx.c b/lmx.c
index 06a8154e585074589d7630cb9950348b33b25692..69b041a16edcb1c9f61cb5cff74e3075c35e81f6 100644 (file)
--- a/lmx.c
+++ b/lmx.c
@@ -94,7 +94,7 @@ lmx_print(const waypoint *wpt)
                gbfprintf(ofd, "        <lm:mediaLink>\n");
                if (wpt->url_link_text)
                        lmx_write_xml(5,"lm:name", wpt->url_link_text);
-               gbfprintf(ofd, "          <lm:url>%s</lm:url>\n", wpt->url);
+               lmx_write_xml(5, "lm:url", wpt->url);
                gbfprintf(ofd, "        </lm:mediaLink>\n");
        }
 

diff --git a/ozi.c b/ozi.c
index 95418879d880a61aadcca5979009eb58270b9fa9..ee215d492e38062f1bcae5151fe9dd14df388721 100644 (file)
--- a/ozi.c
+++ b/ozi.c
@@ -491,6 +491,7 @@ ozi_parse_waypt(int field, char *str, waypoint * wpt_tmp, ozi_fsdata *fsdata)
            operation. */
        if (str && isdigit(str[0])) {
            wpt_tmp->icon_descr = xstrdup(str);
+           wpt_tmp->wpt_flags.icon_descr_is_dynamic = 1;
         }
         break;
     case 6:

diff --git a/pathaway.c b/pathaway.c
index 2e76618174285bbef811ccf54959d3868aa84cc0..b5430db2ae73a4c2890e2ad0fab8b00fb628788f 100644 (file)
--- a/pathaway.c
+++ b/pathaway.c
@@ -447,6 +447,7 @@ int ppdb_read_wpt(route_head *head, int isRoute)
                        case 6:         /* icon */
                            if (*str != '\0')
                                wpt_tmp->icon_descr = xstrdup(str); 
+                               wpt_tmp->wpt_flags.icon_descr_is_dynamic = 1;
                            break;
                        case 7:         /* notes */
                            if (*str != '\0')

diff --git a/xmldoc/formats/delbin.xml b/xmldoc/formats/delbin.xml
index 1ee2447c00670eac0bc090709ae7248bf97db626..40df43e0983ccb2aa35051794db48566546bf0a7 100644 (file)
--- a/xmldoc/formats/delbin.xml
+++ b/xmldoc/formats/delbin.xml
@@ -31,3 +31,17 @@
     </userinput>
   </para>
 </example>
+
+<para>
+  If you receive a message that the device is busy, especially on Windows,
+  that could be because another program, likely Delorme's own, has the 
+  device open even though it's not actively interacting with the GPS.   In 
+  Topo 8, on the GPS tab, look for GPS Options.  Uncheck "Start GPS" and 
+  "Automatically detect GPS".   Then just click the Exchange button when
+  you're ready for Topo to interact with the GPS.  Other Delorme software may
+  be similar.
+</para>
+<para>
+  The GPS should not be in 'map exchange' mode.   When in that mode, it appears
+  as a disk to the USB system, thus GPSBabel will be unable to find the GPS.
+</para>

diff --git a/xmldoc/formats/skytraq.xml b/xmldoc/formats/skytraq.xml
index 543d5bd34b61808c18a1809964a2b50df6ab42f4..787104baaf19bec578f69d8151612a14bdc41133 100644 (file)
--- a/xmldoc/formats/skytraq.xml
+++ b/xmldoc/formats/skytraq.xml
@@ -30,25 +30,25 @@ use this format to read its memory.</para>
   <entry>untested</entry>
 </row>
 <row>
-  <entry>Polaris<entry>
+  <entry>Polaris</entry>
   <entry>Travel Honey</entry>
   <entry>up to 230400</entry>
   <entry>9600</entry>
 </row>
 <row>
-  <entry>Pearl Diffusion<entry>
+  <entry>Pearl Diffusion</entry>
   <entry>Keymate STV-5</entry>
   <entry>untested</entry>
   <entry>untested</entry>
 </row>
 <row>
-  <entry>Canmore<entry>
+  <entry>Canmore</entry>
   <entry>GT-750F</entry>
   <entry>untested</entry>
   <entry>untested</entry>
 </row>
 <row>
-  <entry>Adapt Mobile<entry>
+  <entry>Adapt Mobile</entry>
   <entry>Keychain Pro</entry>
   <entry>untested</entry>
   <entry>untested</entry>